am a0c0316f: Merge "Fix EditText background attr propogation" into mnc-ub-dev

* commit 'a0c0316fe49740b41588f030197027b8aa037d06':
  Fix EditText background attr propogation