Merge "Enable large screen flag in the Settings app" into sc-v2-dev