Merge "Fixed unminimizing during battery saving mode" into oc-dev