Merge "Adding support for extending back behavior in Launcher" into tm-dev