Merge "Fix problems with moving Views around (invalidation, conflict with layout)"