Merge "Fixed issue with background user window consuming touch events" into mnc-dev