Merge "Replace the fixed size values with the new dimen resources." into sc-dev