Merge "Simplify exposing external interfaces to Launcher" into tm-qpr-dev