Merge "Make sure to release split layout when returning to home" into tm-dev