Merge "Add missing features of JELLY_BEAN to feature list" into jb-dev