Merge "PRV should adjust according to Toolbar height if registered." into pi-car-dev