(later, we will decide this more accurately based on the width of the screen in dips, but for now keeping changes so that they can easily be backported to earlier versions of Android) Change-Id: I203addcbf19e8e3813c488af47e4fdf90dcd3115
Change-Id: I2daab961d0727bc5d892db6b50ad0f51fe23873c
Change-Id: Ieafd713393daf5628f229a66441bd3ed293245da