Merge "Fix dim duration on flip to screen off." into sc-dev