Merge "Fix notification shade not expanding from right side after unfold" into main