Merge "Fixed an issue when inflating too many notifications" into oc-dev am: 3a6f2a30ce
am: d68026a77f

Change-Id: I6200bed8201730d2c26e4882277e3632558c403d