Merge "Add a mechanism to hold devices for charging"