Merge "[Bugfix]Switch back to the application on /system when UID and path changed"