Merge "Fix to precompile regex in UiSelector" into jb-mr2-dev