Merge "Updating target SDK for Launcher" into tm-dev