Merge "Relax strictness of mocks in DisplayLayoutTests" into tm-qpr-dev