Merge "Fix split-screen visible apps issue when screen is rotated on lockscreen"