Merge "Hide the increased window size due to colored bars from the view hierarchy" into lmp-dev