Merge "Do not set different gravity for non-moveable nav bar" into udc-dev