Merge "Bug 1699 - FRM: Change data change listener scope from BASE to SUBTREE"