Merge "Don't recreate the dismiss target onConfigurationChanged." into rvc-dev