Merge "Fallback Home doesn't restart on keyboard change" into tm-dev