am 3dc6a630: Merge "Fix performance and other issues related to...
am 3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
* commit '3dc6a630':
Fix performance and other issues related to multi-selection