Merge "Mark focused Views as keep clear areas" into tm-dev