Merge "DO NOT MERGE Don't show notification private view too early" into sc-v2-dev