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

Change-Id: Ib473c039fd8392c8d43c0c1473f0c705c00b625e