am f805b40c: Merge changes Ia2bf4d17,I8242523d

* commit 'f805b40c44769a751d10d404e8ea778a23d5a51a':
  Fix alert dialog alignment and touch feedback masking
  Fix VectorDrawable states