Merge "Add an intermediate dimens resource for 540dp device." into klp-dev