Merge "Fix app widget serices not being unbound." into lmp-dev