Merge "Fix use of API 19+ FrameLayout LP constructor DO NOT MERGE ANYWHERE" into nyc-dev