Merge "Fix wrong permission state changed being notified"