Merge "Exclude dynamic shortcuts from being force themed" into main