Merge "Adjust window focusable by view controller"