Merge "Fix NotificationShade toggling FLAG_NOT_FOCUSABLE" into main