Merge "Consolidate finally block of startActivityInner" into tm-dev