Merge "gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired" into klp-dev