Merge "Change Persistent/Pinned Taskbar App Icon Size to 40dp" into main