Merge "Enable large screen flag in the Settings app"