Merge "Wait to unlock before changing notification importance" into oc-dev am: a07ce03d3c
am: 8637cbeac5

Change-Id: Ia92eb68026a23d584563c45d94610ea456d27476