Merge "Check magnification background type before setting corner radius." into main