Merge "Prevent displays that are disabled from receiving input" into tm-qpr-dev