Merge "Use correct parent for "BackgroundOnly" theme"