Merge "Force input focus to the last focused non-proxy display." into udc-dev