Merge "Changing min-sdk version of Launcher to 31" into main