Merge "SF: Handle all HWComposer::getActiveMode errors"