Merge "Restore scrim views to former place in view hierarchy." into klp-dev