Merge "Change action bar icon and text color from white to grey"