Merge "Add status scrim for full-bleed and update empty" into sc-dev