Merge "Unminimizing after toggle screen on/off shows docked app correctly (1/2)"