Merge "Fix drawer mirroring in Support4Demos" into klp-dev