Merge "Allow status_bar_height to be RRO controlled" into oc-mr1-dev