Merge "Fix activity-alias encryption awareness bug."