Merge "Bring back media_browse_grid_item_padding am: a75c0a2c06 am: dd05dbe2b6 am: b1265decb8 am: 852b93b38b" into qt-qpr1-dev-plus-aosp