Merge "Move optimization mode backup timing into onPause" into sc-v2-dev