Merge "Do not animate scrims when launching camera" into pi-dev
am: aa21ec053c

Change-Id: Ic3089144cb26864bd0e49846348441c7857cce49