Merge "Instrument metrics for smart-auto-rotate and screen timeout" into sc-dev