Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev