Merge "Stashing Persistent Taskbar Background for ime invocation" into main