Merge "Remove TYPE_UNIVERSE_BACKGROUND from system"