Merge "Add API to request light navigation bar in theme" into oc-mr1-dev am: e1cf112b6c
am: e25ff3130e  -s ours

Change-Id: I89eabfb827eeb5dc59a73f6f79ed6773c3d10729