Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev