Merge "Add developer option for back animation DO NOT MERGE" into tm-dev