Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev