Merge \\"QS: Make edit non-clickable when collapsed\\" into nyc-mr1-dev am: 3795313116
am: d556df663c

Change-Id: Ib33d372a52f9c433db7b2e68d4def4d24281c0fd