Merge "[automerger skipped] Merge "Add fallback case to layers_extensions.cpp" am: 46e75a69e8 am: eac760d236 am: a29e519d51  -s ours"