Merge "Fixed upgrading from forward-lock application to system application"