Merge "Mount adopted storage after boot completed"