Merge "Update nav button color when nav button layout changes" into udc-qpr-dev