Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev