Merge changes from topic "flexible_bars" into rvc-qpr-dev

* changes:
  Reintroduce flexible inset mapping
  Keep alternate reference to mStatusBar and mNavigationBar for flexible insets