am ff306b66: Merge "Fix drawer mirroring in Support4Demos" into klp-dev

* commit 'ff306b6613111765f33de105db750e33dec60f01':
  Fix drawer mirroring in Support4Demos