am c8e20f3d: am 57d3b684: am 7b672f78: am 0f5af786: am 014369d5: Bring Gallery2 manifest into parity with CROP support

* commit 'c8e20f3d9c1e33f44985c89e20c4ccde8600a4f0':