Merge "Fix bridged app list saved scroll state" into nyc-dev