Merge "Remove keep clear areas when a view detaches" into tm-dev