Merge "Fixing notification scrim shifted in landscape orientation" into sc-dev