Merge "Revert "Fix replacesLayer assertion to account for splashscreen layer"" into udc-dev