Merge "Update long press layout for large display sizes" into sc-dev