Merge "Fix NPE when reference PipMenuActivityController on TV"