Merge "Fixed a crash with disapearing views" into lmp-dev