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

Change-Id: I0c3cd5244a7483a114b6445b7a532c5ac8185528