Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev