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

Change-Id: I5906d89a1c4e1343dbdbf99f328a5356b4f2be85