ee9512efa6
Merge commit 'dcd1fe5fc8c51b977e80dc3d8856de7572728dcf' * commit 'dcd1fe5fc8c51b977e80dc3d8856de7572728dcf': Unhide constant DATA_ACTIVITY_DORMANT.