Merge "fix toolbar is overlaid on ni-co-bar" into android-snapdragonGallery.lnx.2.0