Merge branch 'backstack-and-custom-css' into fix-notification-polyfills
... to simplify merging to the master, which already has
'backstack-and-custom-css' merged.

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.