Merge "Fix issue where notifications are visible during screen off if bypass is enabled." into sc-dev