When referencing an Android resource ID, you do not need the
plus-symbol if you declared before.
Caution: make sure that the resource you are referring to
is defined EARLIER and not LATER.

Using the ConcatAdapter, we're now able to insert multiple data sources
of information into one RecyclerView and preserve layout/scrolling in
addition to adding the 'Save to Collection' button.

When we simplified our variants, our deep link scheme for nightly was
lost.

* Rename shortcuts to search engine on search screen

* Remove deprecated pref key

* Re-add deprecated string

Targeting Android 10 means we need to support scoped storage or we need to
opt-out of that using requestLegacyExternalStorage="true".

This patch adds the opting-out leaving investigations for what changes we need
for fully supporting scoped storage to be done in issue #12822.

Changed the string values capitalization to sentence case.

Added a margin top of 20dp as well on the buttons so as not to change UI