Merge "Let navigation bar has control if it is focused" into udc-dev