Merge "SIM - Resume view controller" into tm-dev