Merge "Change the all apps atomic transition duration to 150 ms" into tm-dev