Merge "Fix for ANRs due to InputMonitor" into tm-qpr-dev