Merge "Fix an issue where the "mFrameCount" field was accessed without its containing object" into jb-mr1-dev