Fix some rough edges in AppCompat + VDC
am: b0f719227b

* commit 'b0f719227b3fa5d5bb7683bd835f7df504fcc733':
  Fix some rough edges in AppCompat + VDC