Merge "Change the flag of magnification settings to TYPE_NAVIGATION_BAR_PANE" into udc-dev