Also fix layout issue for first row of tiles being too large Change-Id: Icc5c3c6edc8091449bfaa62b44bb6f79d4c6d74b