Merge "Limit the number of concurrent notifs appear on screen am: abe9246caa am: 8c385c261c" into sc-v2-dev-plus-aosp