Merge "Check for null when getting PiP action item drawables." into rvc-qpr-dev