Merge "d2lte: disable world_phone overlay" into cm-11.0