Merge "TEMP: Delay start of Legacy Permission Dialog by 200ms" into tm-dev