Merge "Fixing crash when unfolding with an app already open" into tm-dev