Merge "Remove complicated previousAppId usage"