Merge "Notify doesn't inflate, rename helper." into dalvik-dev