Merge "overlay: rename status_bar_height to status_bar_height_portrait"