Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier