Merge "Set scan flags correctly for preloaded applications" into tm-qpr-dev