Merge "Revert "Force remove DreamActivity from system server""