* commit 'eebf6895fde7ef0d87c91d31b3abb36d4a98df66': Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."