Merge "Fix open app cold in landscape"