Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev