Merge "Support smooth notification reveal..." into main