Merge "Add addOnException of unshelve_server when using sharing server"