Merge "Misc fix in layoutlib bridge + View.isIneditMode as delegate."