Fix jank when switching in and out of hdr+
Also, fix alignment of grid and progress indicator

Bug: 15140487
Bug: 14470553
Change-Id: I09303f16b01a380e617343fa0f3cbe2c12fda147
3 files changed