Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev