Merge "FocusRequester: fix NPE"