Merge commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2' into eclair-mr2-plus-aosp * commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2': docs: document the 'showSearchIconAsBadge" flag and
Merge commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2' into eclair-mr2-plus-aosp * commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2': docs: document the 'showSearchIconAsBadge" flag and