Merge "Fixing the parent check loop to allow RemoteViewsFrameLayout" into nyc-dev