Merge "Fixing Launcher crash if activity restarts while resixing widget" into tm-qpr-dev