Merge "[Settings] Expand the display area of PIN error message"