Merge "Handling statusbar color when back navigation (2/2)" into udc-dev