Merge "Reset last activated time after auto mode changed" into oc-dr1-dev