Merge "Move ACTION_MENU/ACTION_CLOSE intent registraction to PipController"