Merge "Correct android:dimen/status_bar_icon_size for tablets."