Merge "Fix finding views by accessibility id." into mnc-dev