Merge "Tune spacing in navigation bar for small and big devices" into lmp-mr1-dev