Merge "Support for notification panel key on ATV"