Merge "Brightness mirror - fix multi-touch issue" am: 1bfab3de31
am: 44857962dc

Change-Id: Ie5f7a865b3ed1d17444b5133ad530ae6191294a9