Merge "Update SystemUI for sw600dp devices."