Merge "Avoid clearing size compat when app is shown from paused"