Merge "Reduce updating focus when moving an activity which is not resumed yet" into main