Merge "Fix edit contact background on nexus 9" into lmp-mr1-dev