Merge "Fix bug preventing use of android IDs for Views." into mnc-dev