Merge "Check for singleUser attribute even for persistent apps" into lmp-dev