Merge "Add hidden flag in ActivityOptions to ignore PendingIntent creator foreground state" into tm-dev