Merge "Sync dimen from SystemUI"