Merge "Fixed an issue when inflating too many notifications" into oc-dev