Merge changes Ia2bf4d17,I8242523d

* changes:
  Fix alert dialog alignment and touch feedback masking
  Fix VectorDrawable states