Merge "New display options activity"