Merge "Introduce new doze state for docking"