Merge changes from topic "splashscreen-surface" into sc-dev

* changes:
  Do not reparent the SC when package is already realeased
  Display Splashscreen AVD in a SurfaceView