Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev