Merge "Show regulatory info within a ScrollView" into jb-mr1-dev