Merge "Revert "powerhal: Add display off and power collapse enable hint""