Merge "xapp-frame namespace changes"