Merge "Null-check on PipMenuController."