Fix app FC when notification with vibration on is set

Also rework the 4.3 merge for this file

Change-Id: I9208a5c522562e46b126953e99bce25c432417a8