Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev