Merge ""Block notifications screen off" setting is used" into oc-dr1-dev