Merge "Allow customize icon of BannerMessagePreference before Android S"