Merge "Fix main stage full screen after lock phone" into sc-v2-dev