Merge "Fixes tests and issues when toggling new app shortcut popup flag." into tm-qpr-dev