Merge "Use smaller display size for secondary display test. (DO NOT MERGE)" into lmp-mr1-dev