The previous patch for this didn't work for larger screens. behatnotneeded Change-Id: I7d88abbb5ca49dfcbbb45b82b817da26450d645e