Merge "Misc clean up before requesting focus via setFocusedWindow api"