Merge "Revert "Fix wrong permission state changed being notified""