Merge "Treat device storage as a single preference." into arc-apps