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

Change-Id: I2e18284b89f8ba3ac7aca0095392550f345a7839