Merge "Apply restricted settings to notification access." into tm-dev