Merge "Check user restriction on foreground user" into tm-dev