Merge "FocusRequester: fix NPE"
am: c7ed3e7e22

Change-Id: I3984a4d2e2aa6f08e063c1b3dcdff396cf695292