Merge "SupportLeanbackshowcase: clean up preference fragment code" into nyc-dev