Merge "Temporary hide notifications when folding/unfolding" into main