Merge "Update nav bar background size to match handle"