Merge "Set drawable for the entity header app preference button." into oc-mr1-dev