Merge "disable startup shimmy on sd card error" into ub-camera-glacier