Merge "Update statusbar color,nav divider color of settings theme" am: 474d0ab6bf am: 33b02ddfdf
am: e30c7c3afe

Change-Id: Ia101c0b864637b2d06c4538bae220acb924829ed