Merge "Moving view inflation in Launcher to a separate class" into main