Merge "Remove backup of sleep policy setting"