Merge "Change -w600dp to -sw600dp"