Merge "Apply app ops restriction and filter to restricted switch preference" into tm-dev