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

Change-Id: Ife8d7d667b34c5b4faa610628f1014920e8e7948