Merge "App limits sample" into jb-mr2-dev