Merge "Fix race between WM launching app and AMS freezer" into tm-dev