Merge "Don't truncate an app's own label when forcing safe label." into rvc-dev