Merge "Don't auto-mirror QS drawables am: d686e9c26e am: 4573fc8450"